From ffa800fe35873fb7e2f5631622185722a0ae116d Mon Sep 17 00:00:00 2001 From: oliskoli Date: Sun, 20 May 2007 21:23:47 +0000 Subject: [PATCH] Rename module garmin_poi. New name is now garmin_gpi. --- Makefile.in | 4 +- garmin_gpi.c | 36 +++++++++--------- garmin_gpi.h | 4 +- reference/{garmin_poi.gpi => garmin_gpi.gpi} | Bin reference/{garmin_poi.gpx => garmin_gpi.gpx} | 0 .../{garmin_poi2.gpx => garmin_gpi2.gpx} | 0 testo | 12 +++--- vecs.c | 6 +-- 8 files changed, 31 insertions(+), 31 deletions(-) rename reference/{garmin_poi.gpi => garmin_gpi.gpi} (100%) rename reference/{garmin_poi.gpx => garmin_gpi.gpx} (100%) rename reference/{garmin_poi2.gpx => garmin_gpi2.gpx} (100%) diff --git a/Makefile.in b/Makefile.in index 479801a09..3f6fcae2d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -55,7 +55,7 @@ FMTS=magproto.o gpx.o geo.o mapsend.o mapsource.o garmin_tables.o \ ignrando.o stmwpp.o msroute.o cst.o nmn4.o mag_pdb.o compegps.o \ yahoo.o unicsv.o wfff_xml.o garmin_txt.o axim_gpb.o gpssim.o \ wbt-200.o stmsdf.o gtrnctr.o dmtlog.o raymarine.o alan.o vitovtt.o \ - ggv_log.o g7towin.o garmin_poi.o + ggv_log.o g7towin.o garmin_gpi.o FILTERS=position.o radius.o duplicate.o arcdist.o polygon.o smplrout.o \ reverse_route.o sort.o stackfilter.o trackfilter.o discard.o \ @@ -413,7 +413,7 @@ garmin_fs.o: garmin_fs.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h \ jeeps/gpsproj.h garmin_tables.h -garmin_poi.o: garmin_poi.c garmin_poi.h defs.h config.h queue.h gbtypes.h \ +garmin_gpi.o: garmin_gpi.c garmin_gpi.h defs.h config.h queue.h gbtypes.h \ cet_util.h jeeps/gpsmath.h garmin_tables.o: garmin_tables.c garmin_tables.h defs.h config.h queue.h \ gbtypes.h zlib/zlib.h zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h \ diff --git a/garmin_gpi.c b/garmin_gpi.c index 30acc74aa..573fb6aa3 100644 --- a/garmin_gpi.c +++ b/garmin_gpi.c @@ -36,13 +36,13 @@ #include "defs.h" #include "cet_util.h" #include "jeeps/gpsmath.h" -#include "garmin_poi.h" +#include "garmin_gpi.h" #include #include #include #include -#define MYNAME "garmin_poi" +#define MYNAME "garmin_gpi" #define GPI_DBG 1 #undef GPI_DBG @@ -51,7 +51,7 @@ static char *opt_cat, *opt_pos, *opt_notes, *opt_hide, *opt_descr; -static arglist_t garmin_poi_args[] = { +static arglist_t garmin_gpi_args[] = { {"category", &opt_cat, "Default category on output", "My points", ARGTYPE_STRING, ARG_NOMINMAX}, {"hide", &opt_hide, "Don't show gpi bitmap on device", @@ -679,7 +679,7 @@ write_data(const char *group) *******************************************************************************/ static void -garmin_poi_rd_init(const char *fname) +garmin_gpi_rd_init(const char *fname) { char cp[8]; @@ -697,7 +697,7 @@ garmin_poi_rd_init(const char *fname) static void -garmin_poi_wr_init(const char *fname) +garmin_gpi_wr_init(const char *fname) { char cp[8]; cet_cs_vec_t *vec; @@ -738,7 +738,7 @@ garmin_poi_wr_init(const char *fname) static void -garmin_poi_rd_deinit(void) +garmin_gpi_rd_deinit(void) { if (dt->category) xfree(dt->category); if (dt->group) xfree(dt->group); @@ -748,7 +748,7 @@ garmin_poi_rd_deinit(void) static void -garmin_poi_wr_deinit(void) +garmin_gpi_wr_deinit(void) { queue *elem, *tmp; @@ -762,20 +762,20 @@ garmin_poi_wr_deinit(void) static void -garmin_poi_read(void) +garmin_gpi_read(void) { while (! gbfeof(fin)) { /* main loop */ int tag; tag = gbfgetint32(fin); if ((tag == 0xffff) || (tag == 0xff)) return; - if (! read_tag("garmin_poi_read", tag, NULL)) return; + if (! read_tag("garmin_gpi_read", tag, NULL)) return; }; } static void -garmin_poi_write(void) +garmin_gpi_write(void) { if (strlen(opt_cat) == 0) fatal(MYNAME ": Can't write empty category!\n"); @@ -788,21 +788,21 @@ garmin_poi_write(void) /**************************************************************************/ -ff_vecs_t garmin_poi_vecs = { +ff_vecs_t garmin_gpi_vecs = { ff_type_file, { ff_cap_read | ff_cap_write /* waypoints */, ff_cap_none /* tracks */, ff_cap_none /* routes */ }, - garmin_poi_rd_init, - garmin_poi_wr_init, - garmin_poi_rd_deinit, - garmin_poi_wr_deinit, - garmin_poi_read, - garmin_poi_write, + garmin_gpi_rd_init, + garmin_gpi_wr_init, + garmin_gpi_rd_deinit, + garmin_gpi_wr_deinit, + garmin_gpi_read, + garmin_gpi_write, NULL, - garmin_poi_args, + garmin_gpi_args, CET_CHARSET_MS_ANSI, 0 /* WIN-CP1252 */ }; diff --git a/garmin_gpi.h b/garmin_gpi.h index 1811cc84d..9fe604d06 100644 --- a/garmin_gpi.h +++ b/garmin_gpi.h @@ -1,5 +1,5 @@ -#ifndef GARMIN_POI_H -#define GARMIN_POI_H +#ifndef GARMIN_GPI_H +#define GARMIN_GPI_H static char gpi_bitmap[] = { 0x00,0x00,0x18,0x00,0x18,0x00,0x18,0x00,0x08,0x00,0x00,0x00,0x40,0x02,0x00,0x00, diff --git a/reference/garmin_poi.gpi b/reference/garmin_gpi.gpi similarity index 100% rename from reference/garmin_poi.gpi rename to reference/garmin_gpi.gpi diff --git a/reference/garmin_poi.gpx b/reference/garmin_gpi.gpx similarity index 100% rename from reference/garmin_poi.gpx rename to reference/garmin_gpi.gpx diff --git a/reference/garmin_poi2.gpx b/reference/garmin_gpi2.gpx similarity index 100% rename from reference/garmin_poi2.gpx rename to reference/garmin_gpi2.gpx diff --git a/testo b/testo index 3bdc50732..414868497 100755 --- a/testo +++ b/testo @@ -1229,13 +1229,13 @@ ${PNAME} -i tomtom_itn -f ${REFERENCE}/route/tomtom_itn.itn -o tomtom_itn -F ${T compare ${REFERENCE}/route/tomtom_itn.itn ${TMPDIR}/tomtom_itn.itn # -# Garmin Points of Interest "garmin_poi" (.gpi) +# Garmin Points of Interest "garmin_gpi" (.gpi) # -${PNAME} -i garmin_poi -f ${REFERENCE}/garmin_poi.gpi -o gpx -F ${TMPDIR}/garmin_poi.gpx -compare ${REFERENCE}/garmin_poi.gpx ${TMPDIR}/garmin_poi.gpx -${PNAME} -i gpx -f ${REFERENCE}/garmin_poi.gpx -o garmin_poi -F ${TMPDIR}/garmin_poi.gpi -${PNAME} -i garmin_poi -f ${TMPDIR}/garmin_poi.gpi -o gpx -F ${TMPDIR}/garmin_poi2.gpx -compare ${REFERENCE}/garmin_poi2.gpx ${TMPDIR}/garmin_poi2.gpx +${PNAME} -i garmin_gpi -f ${REFERENCE}/garmin_gpi.gpi -o gpx -F ${TMPDIR}/garmin_gpi.gpx +compare ${REFERENCE}/garmin_gpi.gpx ${TMPDIR}/garmin_gpi.gpx +${PNAME} -i gpx -f ${REFERENCE}/garmin_gpi.gpx -o garmin_gpi -F ${TMPDIR}/garmin_gpi.gpi +${PNAME} -i garmin_gpi -f ${TMPDIR}/garmin_gpi.gpi -o gpx -F ${TMPDIR}/garmin_gpi2.gpx +compare ${REFERENCE}/garmin_gpi2.gpx ${TMPDIR}/garmin_gpi2.gpx exit 0 diff --git a/vecs.c b/vecs.c index bf3f5fdb9..7819af044 100644 --- a/vecs.c +++ b/vecs.c @@ -117,7 +117,7 @@ extern ff_vecs_t alantrl_vecs; extern ff_vecs_t vitovtt_vecs; extern ff_vecs_t ggv_log_vecs; extern ff_vecs_t g7towin_vecs; -extern ff_vecs_t garmin_poi_vecs; +extern ff_vecs_t garmin_gpi_vecs; static vecs_t vec_list[] = { @@ -655,8 +655,8 @@ vecs_t vec_list[] = { }, #endif { - &garmin_poi_vecs, - "garmin_poi", + &garmin_gpi_vecs, + "garmin_gpi", "Garmin Points of Interest (.gpi)", "gpi" }, -- 2.30.2